From: Colin Walters <walters@verbum.org>
Date: Wed, 8 Jul 2009 00:45:43 +0000 (-0400)
Subject: Merge up to commit 92e608bd0f3807314c45ee5f5daf6ba781c27d58 of gdm
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~11212
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f353283a40d0f8800c8ad263715ca9d3e3e4c008;p=gnome-shell.git

Merge up to commit 92e608bd0f3807314c45ee5f5daf6ba781c27d58 of gdm

Pull in a few fixes from gdm trunk for gdm-user.c
---

diff --git a/src/gdmuser/gdm-user.c b/src/gdmuser/gdm-user.c
index e571a81d4..ffd57f94a 100644
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@@ -20,6 +20,7 @@
 
 #include <config.h>
 
+#include <float.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -881,7 +882,7 @@ curved_rectangle (cairo_t *cr,
         x1 = x0 + width;
         y1 = y0 + height;
 
-        if (!width || !height) {
+        if (width < FLT_EPSILON || height < FLT_EPSILON) {
                 return;
         }
 
@@ -1156,8 +1157,8 @@ gdm_user_render_icon (GdmUser   *user,
         } else {
                 pixbuf = NULL;
         }
- out:
         g_free (path);
+ out:
 
         if (pixbuf != NULL) {
                 framed = frame_pixbuf (pixbuf);